bitkeeper revision 1.1274.1.2 (4252c7d9ZNwE-cRS8KJmI-2X3Ui91A)
authorbren@br260.wolfson.cam.ac.uk <bren@br260.wolfson.cam.ac.uk>
Tue, 5 Apr 2005 17:16:09 +0000 (17:16 +0000)
committerbren@br260.wolfson.cam.ac.uk <bren@br260.wolfson.cam.ac.uk>
Tue, 5 Apr 2005 17:16:09 +0000 (17:16 +0000)
Merge br260@scramble.cl.cam.ac.uk:/usr/groups/xeno/BK/xen-unstable.bk
into br260.wolfson.cam.ac.uk:/share/project/xeno/xen-unstable.bk

1  2 
xen/common/dom0_ops.c

Simple merge